From 40fc7c4e2458c5a9a5b917e1ced05d7bf443d8b2 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 31 May 2016 01:41:36 +0300
Subject: [PATCH] Remove useless format calls from tests

---
 tests/net-config.rs | 20 ++++++++++----------
 tests/package.rs    |  4 ++--
 tests/test.rs       |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/net-config.rs b/tests/net-config.rs
index d4fdb3b12..deb9ff940 100644
--- a/tests/net-config.rs
+++ b/tests/net-config.rs
@@ -7,7 +7,7 @@ use hamcrest::assert_that;
 #[test]
 fn net_retry_loads_from_config() {
     let p = project("foo")
-        .file("Cargo.toml", &format!(r#"
+        .file("Cargo.toml", r#"
             [project]
             name = "foo"
             version = "0.0.1"
@@ -15,7 +15,7 @@ fn net_retry_loads_from_config() {
 
             [dependencies.bar]
             git = "https://127.0.0.1:11/foo/bar"
-        "#))
+        "#)
         .file("src/main.rs", "").file(".cargo/config", r#"
         [net]
         retry=1
@@ -25,14 +25,14 @@ fn net_retry_loads_from_config() {
 
     assert_that(p.cargo_process("build").arg("-v"),
                 execs().with_status(101)
-                .with_stderr_contains(&format!("[WARNING] spurious network error \
-(1 tries remaining): [2/-1] [..]")));
+                .with_stderr_contains("[WARNING] spurious network error \
+(1 tries remaining): [2/-1] [..]"));
 }
 
 #[test]
 fn net_retry_git_outputs_warning() {
     let p = project("foo")
-        .file("Cargo.toml", &format!(r#"
+        .file("Cargo.toml", r#"
             [project]
             name = "foo"
             version = "0.0.1"
@@ -40,7 +40,7 @@ fn net_retry_git_outputs_warning() {
 
             [dependencies.bar]
             git = "https://127.0.0.1:11/foo/bar"
-        "#))
+        "#)
         .file(".cargo/config", r#"
         [http]
         timeout=1
@@ -49,8 +49,8 @@ fn net_retry_git_outputs_warning() {
 
     assert_that(p.cargo_process("build").arg("-v").arg("-j").arg("1"),
                 execs().with_status(101)
-                .with_stderr_contains(&format!("[WARNING] spurious network error \
-(2 tries remaining): [2/-1] [..]"))
-                .with_stderr_contains(&format!("\
-[WARNING] spurious network error (1 tries remaining): [2/-1] [..]")));
+                .with_stderr_contains("[WARNING] spurious network error \
+(2 tries remaining): [2/-1] [..]")
+                .with_stderr_contains("\
+[WARNING] spurious network error (1 tries remaining): [2/-1] [..]"));
 }
diff --git a/tests/package.rs b/tests/package.rs
index f9a810fb4..7bc7dcdfe 100644
--- a/tests/package.rs
+++ b/tests/package.rs
@@ -108,7 +108,7 @@ http://doc.crates.io/manifest.html#package-metadata for more info.
         dir = p.url())));
 
     let p = project("all")
-        .file("Cargo.toml", &format!(r#"
+        .file("Cargo.toml", r#"
             [project]
             name = "foo"
             version = "0.0.1"
@@ -116,7 +116,7 @@ http://doc.crates.io/manifest.html#package-metadata for more info.
             license = "MIT"
             description = "foo"
             repository = "bar"
-        "#))
+        "#)
         .file("src/main.rs", r#"
             fn main() {}
         "#);
diff --git a/tests/test.rs b/tests/test.rs
index 961498900..11a2cc54c 100644
--- a/tests/test.rs
+++ b/tests/test.rs
@@ -2115,9 +2115,9 @@ fn only_test_docs() {
 
     assert_that(p.cargo("test").arg("--doc"),
                 execs().with_status(0)
-                       .with_stderr(&format!("\
+                       .with_stderr("\
 [COMPILING] foo v0.0.1 ([..])
-[DOCTEST] foo"))
+[DOCTEST] foo")
                        .with_stdout("
 running 1 test
 test bar_0 ... ok
-- 
2.30.2